First commit, code still unclean