Progress in making it actually function!