Fixed up simulator. Still need to implement scaling.