More progress on final project, just working on a few small issues/enhancements.