More TODOs;
Added input group support;