Added base functionality, no UI yet