Added resource_factory, worked on display