I haven't cleaned this out because it's an interim step - I don't know what I'll need here until I figure out attribute injection part.