Contunue refactoring to add blog capability