Debugged previous commit, now compiles