moving these into app. they seem to belong there; i am constantly recompiling to test app