pulled in lib from master
moved files around, mimicking master, prepping for merge (note: broken)