many changes... i need to commit more often