Updated; sadly I didn't commit my changes last time I worked on this project.