Initial Commit, working switcher
Fixing Display