Ya sorry about the change here; this class was just doing too much to be useful.