lots of more puzzle stuff, almost finished