Doing more stuff in the switchcase to keep the codebase a tad cleaner