Adding all the boring stuff