first version of 2.0 WIP