Cleaned up the merge and added my own solution