Huge update - V1.0-RC1