working on reverting changes
MVP complete