Safe and sound :)

Just visual changes to go. Everything else is working.