update, needs debug
change name space
change include setup, probably needs a more meaningful name
update for personal git