Major changes to controls and parent/child functions