Move everything to init to prevent further issues
Merge pull request #1 from ganymedes01/master

Move everything to init to prevent further issues