Stable Verions

Stable Version, good enough to demo but needs some work to fix the
architecture.