Core functionality all working, with a better random generator system in place.