I knew this would be a little painful, but time to get it
over with. Build not tested/fixed yet.