adding what I have so far
added stuffs
Fixing merge conflict