Now with comments! and other options!