First large interactive project - week2 of refactoru