Feature/embed fixies