+1 update

Kicking some ideas back and forth, the code is very rough!