First commit of stuff from Ishan and Jason
Partway through Ishans interface idea