Catch up continued

Here are the rest of the catch up:)