made a lot of changes, need to commit more