Thursday Commit

including David's lib from yesterday