Added files, more work on action framework