Added TODOS and reformattet