Almost working, almost done