Serious artwork removal and refactor;