Committing existing code

Needs to be refactored, even for a sandbox =)