Finished return switch. Test passes. Need more tests.... :)
Added TODO about tests