Got almost everything working