There is way more in this patch than I expected! Time to go to sleep and get ready for some sightseeing tomorrow!