Refactored the things that make it work.
Merge remote-tracking branch 'origin/master'