Fixed a few bugs. Still timing out on Future.... need to understand this better