First approach for milestone 1

First approach for milestone 1