Slightly Optional

Progress made towards restoring it from its clusterfuck. Still doesn't
work, as I am likely reaching the end of where I got to when
refactoring. But still, progress(?)