added some stuff, needs styling