added base functionality - go go go bugfixing!