Fixed splicing *again*. Everything sort of works