Committing leftover changes from last time I worked on the code.