please take my commits

staging & properties plugins