Alex branch

the things that i did