Hopefully fix the tuple issue, and really close #5