First Commit

This is already working. That being said, going to this branch before
commuting all changes