Got everything working close to perfect