urgh. bugs everywhere. made some progress on file reorganization