Firstiteration

First iteration of changes