WIP - cleaning up new functionality