Some Changes
More design
having some problems with the merge