More stuff for @csi7585

look at this