(Hopefully) Final Modjam commit. Will fix any bugs that people submit after wards