Add CivicActions, revise generally