Final Merge of code from the IPM thesis project