many new features, many broken features
trying again