adding most classes needed for #28