Finished async task implementation, handled data encapsulation
Smashed merge conflicts with a hammer