Converted entire project over to something that shouldn't break as easily