Updated to handle new library structure
removed unused lines and crud from experimenting
fixed missing dependency on HashtableExt