more
WIP
tests!!!