wip...
add support for dots