Committing NFC stuff
Fixed my branch

committed a mix of code, want just my stuff then merge it together
later.