mostly done big scheme

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
Merge remote-tracking branch 'origin/master'