still working on make, moved simple libraries into project