Updates
merge
Comitting now before i bust everything up with the redeisgn