temporary
Misc
Revert "temporary"

This reverts commit 503816b096f004d3dcb2927f910d9841893d9d0f.
This should do for testing.
Some progress.