Woo Hoo

Finished and Still making some changes