almost done. couple of more tasks.