Cleaning up my w/c again. Add documentation