Second commit. Finish main body