special action framework readded, prelim clean up