Final Commit... Yup.. only 2 commits... very pressed for time :P