more changes and testing
remove redundant migrate user
added application helper
merge needed
merge to master