Feature/figsify