Added temp screens, removed test functions.  Added test functions file