Stuff for justin.
Added settings back.