Various changes building up basic architecture