merged v dave z pr
removed extra crud
refactor a tad