Added basic support for the Draw and some basic tests.