Updated code so that it really properly works now, beginning refactoring of the working code
Removed object file from repository