Still Refactoring
from desktop