Added a property, made environment do some more stuff