So, I've taken this completely apart and am adding some new features.