Mostly finished this file

Almost done