Fixing everything to work with Drawable class WIP - buggy