Updated to newest code base

Original upload was an old code-base. Uploading newer code.