I've started re-working the class, which should be done in a few days.