started working on the mark2 branch nothing complete... and everything broken, so fix it fast!