Updating personal fork

Hoping I've got the proper direction this time...