Effron Pull Request

I'm still honestly not exactly sure what this is all doing - please let me know if everything is set up properly!