more changes
merge
finished working on the back end architecture