do not merge - code review 9/10

code is looking pretty good guys!