Removed the first attempt at components. Coming back to it when I've thought about it more, and also when I'm ready to focus on it.