I need to add better testing here