Commented and did stuff to help set up matt