2nd week submission
did some functional