Add switch statement, ACTUALLY switch to java 7