Future

Re-implemented pretty much everything.