This portion is visually done, pending comments.