Restructuring some things; starting world support.