Funkay dev

Just aligning my branch with the corrected master