Warning, this is not working yet!
Restructuring helios.