refactor
pre code cleanup
cleanup done
works again
refactor cleanup
include works
first version works
samples expanded