Work on breaking out the components