Heavy edits/expansion, changed outline