Work in progress

Work in progress. Adding in export functionality, added 2.1 fixture, comments, minor tweaks.