Got everything working

Time to try to get the extra credit done