partially working application.  Removing static references in next upate