More features, I need to commit more often