Add massive improvements and doubled functionality