move more code into LavenderProperties