poo
took stupid things out
merge with master