Added Drawable interface
Rearranging...