WIP updates from bobby