WIP, adding a switch statement