Brought Matthew up to speed.

added todo comments and made some tweaks