Moved stuff around so I lives seperate to fatfree