WIP on day9 and 10

https://app.asana.com/0/11169835259592/12152479471888