WIP - UI stage 3 - saving components