Added building up the base library