Adding some comments and placeholders