Random work

Changed a few things around, and added some random work