merged with kevin's code from before wednesday
fixed tray and block
finished the project