Changes based on hal9000 progress