Current work checkpoint. See diff for details.
removed .idea