Undo most of that stuff in prompt
Fix most of rest of prompt