First commit
Clean up