Some quick changes, not even sure if they work

Not compiled either.