fix error from last commit. need to find bugs/add tests/refactor