Added a lot of stuff, designing