Updating some of this stuff, adding more common basic functionality