wip not happy yet
WIP

works but needs cleanup spelling etc.