Coming along, need to reimplement some systems to get visual results