Almost done

Just doing runs to find bugs