Refactor plans completed!

Thus making the code more async and better and stuff