edits to get everything working on my machine
catch up to local