Buggy commit

But didn't have time to finish working on a fix