Cleaned up and got the component as a free standing with relevant tests in place.