Added basic output and editing functionality