Removed excess junk + added draft