Initial work for 1.0. WIP