Added autofac, listings, started editing