Changes

This is the current working code as of 3/18.