I should commit more often...