Done with comments, need to refactor with WTF partials