Started using natural doc to make refactoring easier