working on fixing contexts, 55% done