dev make basic version work