merged afshin/steve, made compilable, fixed style issues  no runtime functionality yet