Added some stuffish stuff