WIP: Updated notebook.. getting some where