Built in some more stuff