Add the rest of bjz's libraries