Work in progress

Signed-off-by: Mike Stitt <mikes@spindance.com>