add these so they build
Merge remote-tracking branch 'origin/frankie-r6' into frankie-r6
fix those up
Merge branch 'frankie-r6' of https://github.com/The-Ancile-Project/vendor_frank into dok-r7