Working on remote drawable support. Tons of refactorings