Added a TODO and readded position updating