First commit, including a bit of everything