I'll rebase this to the newest develop branch, and declare them as yaml assets