final changes to get everything working together for the time being