lots of changes, getting messaging figured out. not there yet