Feature/go makeup