First real commit, needs modules, needs output format etc