The top was trickier and caused more swearing than expected

Getting the shape took some work