Various changes to include lots of various bits of code