17th commit, clean-code/more testing/load & scalability