Updating main; Updating cabal to build lib