Added a whole bunch of goal-like stuff thanks to the excellent ideas at kennethreitz/dream-python