pulling alexs branch
pulling alex branch
pushing merge mine and alexs
added some hovers