Justin

I updated this with a variety of mind-ruining changes