refactor - using StickIt.