Issue: less Dom manipulations, more comments