Fixed up code, almost done