Version 1.8

Final Version of this iteration

Commented fully and remaining errors fixed