Mass part of code seems to be working, including the SN1a DTD