More janky edits; nowhere near working.