SoB: Updates

Few changes already, big work incoming in the next few days.