Do bare minimum for milestone 1