First pass at mdfication