Incremental commit

Number pickers working sort of