Latest and greatest

Has everything working.