Big update, got to commit more often