WIP: update to 1.0