lots of changes - I need to commit more