First major push of everything working