added some stuff

Can I merge this?