Phase 3 - Beta FINAL

Code freeze; All features implemented