I think it's finished! All check-expects behave correctly and (most) of the code is commented.
All it needs now is check expects and to be cleaned up.