Adding drawables and State temporary, simple logic