IN PROGRESS NOT COMPLETED MIGHT REDRAW