start on cleaning up and rearranging examples