Merge pull request #1 from Kereru2014Sharpies/team

setup data for tables
update switch, added return current choice method