Basic components in place
Removed suo