Commit code ready for March branch
Update plotting code
rm base files