Merged
Making it look nice for turning it in hopefully