mk5 - Fully working

Still a big mess though!