Latest batch of changes, just trying to keep people watching up-to-date with where I'm at