Used nested resources, added class notes