Working on various formatting to get things working.