Done. Finally. TODO: Check drawing graphs