comments fully working now.. check it out (there are some TODOs, but basic functionality is fully working)