Got basic functionality to work