commiting to this branch but going to probably start in a different direction