file cleanup
file cleanup
wip
wip
functions in place
more function cleanup and updated readme