Initial attempt at new program layout
Done with sample program