initiated library refactor *
started rewrite
further structural changes @ no test
miscellaneous *
fixed *
cleanup
cleanup
cleanup
cleanup