Final edits, adding functions to init