Fixed bug in future stuff and hopefully my git stuff works now...