Fixed a bunch of bugs and cleaned up some unnecessary complication
Not using that input val
Resolved conflict. No concat cause we're checking on set, now.