Change order of function/async calls
Merge branch 'master' of https://github.com/authentik8/eikonhack2.git