Added more feature specs, but not got things passing yet.