Followup commit.

Not fully working. Misses stuff.

DO NOT MERGE!