V2.0.0 pre.x

Well here it is the 2.0 PR

Leave any comments here if you see something wrong / off