Adding the rest of stuff