Restructured again, still no right
More experimental stuff