General clean up and ability to add ponderings