[JRO] WIP. First pass getting this working