updates to get the damn thing working
Merge branch 'rebuild'