start work on entry definitions, update macro logic as well as inclusion of preview logic

--HG--
branch : noink