Moved init vars outside class - now parsed in from dictionary