Moving towards getting everything working