made basic version work!