Added a bunch 'o stuff