Outlined the new program skeleton and cleaned up a bit.