Various changes. Definitely need to reorganize.