Initial commit
Cleaned up sorted a little