Started on a better documentation style