Cleaned and Edited-still work in progress