Moved initaliation to a file of its own