Added more intentions, cleaned up intention logic.