More work done on full game version.