First approach for milestone 1