Got everything working, including bonus