progress
merge
invalid activities_controller tests now passing