add both screens to main, still needs work
fix a lot of import statements, remove commented code, try to get things to run