Deleted #8. First try at #7. More testing to come