Started final work on ContentManager