Make a working version

We need to consolidate all the stuff into a working branch!!