Revert "Revert "okay... maybe more difficult than i expected""

This reverts commit fcc04f6c3769b1e819fd1fc61eebf52a9ddc2199.