saasclass - finally got around to working on this