mapping out of basic content pretty much completed