REFACTOR all property js under property until see requirement to make it generic
REFACTOR as last message