Got rid of Switch Statements