Following features will be worked on (w/ tej & quoc):