Created new code base for 0.1_7