Refactor... progress..