Initial commit
Cleaned up