Starter stuff for ADTs question(s)
fix merge conflicts