added functionality (wip)