hyphens not allowed in app name
clean up imports, misc
pull in code from outsite app
cleanup imports/misc