refactored & started running as app, not class