Changes

Lots O Stuff

Signed-off-by: Joshua Pekera <joshuapekera@me.com>