Working prototype. Now to working branch