began proposal controller testing
merge commit