Working quick swap
Traps state
Moving non-generic things to a Impl folder