Changes to get it to compile; basic runtime