Squash commits, rename files
Remove puts statement
WIP
WIP
WIP
WIP
WIP
WIP
WIP
WIP
WIP
WIP
Refactor a little
WIP
WIP
WIP
WIP
WIP
WIP
WIP