#9 Add debug | Clean up of code and files