[WIP] Components, II attempt