Initial commit
Clean up master