Fixed bad exception handling. Whoops.
Renames. Now using list of Steps in writer.