Work on the refactor/breaking out components