readying app for alpha demo
merging in with server