Tested and working

Nice and clean