Changed to async / await pattern

1.0 is finished (minus settings)