Fixed up file. Need to add signals