Going on with components part (actually hidden work in progress)