Added a ton of things, this finishes things, stuff

Just added things in a coffee induced rush.