Made into library project