Better perspective and outlining - needs cleanup around top