Added some functions to the mockup...