Got everything working in a consistant fashion