flattening + property handling
forgot to add a file in last commit