Cleaner source
Beginning work on exporting content