working
version saved before phase 3
first commit