Enhancement/3 remove async loading

Closes #3