Added Actions plus cleanup. More to be done.