some progress but bit funky...