My update

Trying to merge some stuff with what Jon has implemented because we
conflicted on C4GUI