Making progress on #2 (closed) .
Only thing left is captouch, but I'm leaving that until one last refactor by moon2.