Update: More work for Helix compatibility

WARNING: There are bugs still and users are warned not to update yet.
Gotham compatibility is completely broken with this commit.