Step by step/basic

Building the Basic branch