Model Changes for UUID instead of Object holding. 

I have not fixed all the breaks yet, I am looking for feedback about direction. will continue working. 
Same as above.