Added new data ata and rudimentary context switching (its not really right yet)