Adding Libraries, fixing up copied work