Added dirty map and test drawer.