Gonna start adding tests
Comment out buggy code; fix with tests