implementing in app logging
updating fred
merging master