Managed to get it into a non-working state; final commit before reverting