major changes to make this work
Merge branch 'working-copy'