okay, almost all done, need to fix the null pointer, also note what I
wrote
Merge remote-tracking branch 'origin/master'
here is the lost maman 21... had to share it...