refactor move; prepare to add activity tests
fix port to localhost:3000
fix localhost port
fix merge conflicts