made non-blocking.... removed all refactoring because it was broke as hell