Much more rigorous MASCOT workflow and major tidy up