Last working build before adding GUI