Basic functionality present, working on timing next