Pulls dev-gui into dev

Finishes implementation of basic gui