Added a ton of stuff

+ renamed some things
+ included the rest of the header components