BETA1

Basic cleanup to release first end-user friendly version,