Zoher

Merging branch with slightly refactored code to start final draw function