master - WIP Almost done