Tabbed all the new files, fixed the stackoverflow error