Hopefully complete solution to 1-24