Handing basic tuple/array containers now
More tests passing