WIP - removing some diffs from master
WIP - more diff removal
Finalize merge - issues resolved
builds and loads on booted system, also boots in VM. Testing bare metal