back to ground zero - just get it working
Merge branch 'initial-fix'