First commit
Cleaned up