Added minimal functionality (WIP)