Added the GUI back, commented stuff, started move pieces