Major revamp
Merge remote-tracking branch 'origin'