First commit, the right place this time