Refactored everything to use screens, still needs work