Fairly working
Started v2 design