Adding misc stuff from a bit ago