starting to rearrange shit and get it closer to working. also added beginning of tuple support.