starting to make codebase sane