Adding some and breaking out for better testing