big commit

before changes to structure to fit mvc better