Nearly Working (UI updates are somehow broken) and changed the way this app will handle windows later (incomplete)