Final Changes

This should be my final set of commits.