Beta Update

First working version.