Stage 1b of complete rewrite. Unfunctional without next stage finished. Use "old" branch for now.
Stage 1b of complete rewrite. Unfunctional without next stage finished. Use "old" branch for now.

Fixed up some logic. Status checks needs  to be fixed before testings begin properly

andreherberth/pockethold