Major Overhaul of Custom Actions