added actions.rb stuff
merged Dustin and JI changes