We wont need the return statements if we can roll all the logic a bit cleaner