Multiple changes-not exactly finished, but turning it in.