INIT DEV 0022

Working on stuff. Merge with john