Code modifications and library project

Modified test project and attempted to create library project