Changes made due to last meeting, still missing the combined logging/preview