Overhaul Complete

Signed-off-by: SaoBiz <alexggrech01@hotmail.com>
Merge branch 'overhaul' into develop