more mvc and -l -a
remove TODO