Yoink with some custom edits and merged pulls