First iteration of additions/changes

Here's some additions based on what I've picked up so far. Please check these as I cannot currently figure out how to run this in order to test it...