got things mostly rolling, need to add scopes and tests