jophwlocks: Prepared for merge