Tried to componentizing --still going on