Revert "work in progress but probably in the wrong direction"
Revert "work in progress but probably in the wrong direction"

This reverts commit dfaf9c1794a32d34322b21924362f2d5abaf8b25.

universalcore/springboard,universalcore/springboard,universalcore/springboard