makin changes
changed design and a bunch of stuff