Initial commit
Cleaned up a little bit