This is the correct commit at this point
Funny merge with github. Looks like all is well.

Learned something as well.

Conflicts: