[SQUASH ME] Some more functionality and documentation