Almost working GUI... Tests pending